[automerger skipped] Merge "Build service-connectivity with system_server API"...

[automerger skipped] Merge "Build service-connectivity with system_server API" am: 839a7611 am: 3dde3caa -s ours am: d62c5d9a -s ours

am skip reason: Merged-In I454e8a0a8d0e0f9e6d21a8e8faf5a9e299962ad4 with SHA-1 5625b1f3 is already in history

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

Change-Id: Ice2981f32b422f89c6423f39816a9c0fbcc0699c