[automerger skipped] Merge "Start platform compat service eariler." am: c0442d5b80 -s ours
am: a365bd024e -s ours
am skip reason: change_id Ie1130a3f0bdd1769fe0755db0089702ea64d9db6 with SHA1 8266ae32ba is in history

Change-Id: I0d7b15dd953d22e79f41aaff43c011b3d047a24f