[automerger skipped] Merge "Create service-connectivity.jar" am: bfceacea...

[automerger skipped] Merge "Create service-connectivity.jar" am: bfceacea am: b91257f5 am: 5b03885d am: f7ebb0c0 -s ours

am skip reason: Change-Id Ie732bfaf381404af0bb599ca2f421a96e7aa4257 with SHA-1 e6f27dd7 is in history

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

Change-Id: I431314b5ee4a18c462850c21a7dabc00da89016e