[automerger skipped] Merge "Start platform compat service eariler." am: c0442d5b80 -s ours am: a365bd024e -s ours
am:5f3a0e7967-s ours am skip reason: change_id Ie1130a3f0bdd1769fe0755db0089702ea64d9db6 with SHA18266ae32bais in history Change-Id: Id5f7c82990ed95416575be416ddf6ce23534bd45
This commit is contained in: