[automerger skipped] Merge "Remove hidden connectivity method usage" am:...

[automerger skipped] Merge "Remove hidden connectivity method usage" am: 82628265 am: cec2c552 am: 3aaf6754 -s ours

am skip reason: skip tag Change-Id I5e23bd0ab2e82fc3583c56162d5ac3fec6cfc359 with SHA-1 27691f84 is already in history

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

Change-Id: Id77f7514def20bc7171780a7bf4ad009c5821776