[automerger skipped] Merge "Create service-connectivity.jar" am: 4a19a57729 am: b91257f553 am: acc01f1346 am: 5e5c1a72bb -s ours
am skip reason: Change-Id Ie732bfaf381404af0bb599ca2f421a96e7aa4257 with SHA-1 dfba5d17fe is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1351252
Change-Id: I431314b5ee4a18c462850c21a7dabc00da89016e
This commit is contained in: