[automerger skipped] Merge "Add LocalManagerRegistry inside system server."...

[automerger skipped] Merge "Add LocalManagerRegistry inside system server." am: 76348ffa am: 4eb5f086 am: 7f037415 -s ours am: 6c7a166d -s ours

am skip reason: Change-Id Ib9f14070a665ebd8c582376d7ea044d9b945b6b0 with SHA-1 bd47187f is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3289be4e330b575223872b03751ba926c88793ce