[automerger skipped] Merge "[MS53] Add connectivity aidl exports to stubs" am:...

[automerger skipped] Merge "[MS53] Add connectivity aidl exports to stubs" am: e616cb67 am: f7f4c4c9 am: 5202e614 am: 516956cd -s ours

am skip reason: Merged-In Ie19a258c2e8a724dc087bc5ad5f8f522e29feca5 with SHA-1 5bf27120 is already in history

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

Change-Id: I50ad15a161a27f04316b5513eb57bbab3ed88b4a