tree 6dcd475fbe3c1789fb171acdb51e7d52314e8580
parent e545a5dbbfddd99741c955d910a0a0c9998012c9
parent 38fe45b539e8a11f63c1dbf7715a44144a3cfab9
author Julia Reynolds <juliacr@google.com> 1653608891 +0000
committer Julia Reynolds <juliacr@google.com> 1653665070 +0000

[conflict] Move service initialization am: 38fe45b539

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18563202

Change-Id: If27ee7e26bcf2797a6a4a770f2a5064605cdeaa0
Merged-In: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>