tree 1f378fdab22373fe2af3eefc47820bebe9dfd477
parent f7a60ec323bdbc8e99f7b43b87997062125a9ab5
parent 3ed496a19df323dbe25bca8d90e91a19124f3155
author Anna Trostanetski <atrost@google.com> 1566305584 -0700
committer android-build-merger <android-build-merger@google.com> 1566305584 -0700

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

Change-Id: I0b25e86c6c61503995070309d2eb003e517ebc46