[automerger skipped] Merge "Merge framework-connectivity impl and stub...

[automerger skipped] Merge "Merge framework-connectivity impl and stub targets" am: 1ebfd586 am: aac54a4b -s ours

am skip reason: Merged-In I76d7cf1ba31a3f38ae6b9facbf1b668860c8c165 with SHA-1 f3114979 is already in history

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

Change-Id: I12dc551cce4ba3a8c337d817f39739f2cf917a20