Merge "Remove hidden connectivity method usage" am: 82628265f6 am: cec2c552d1

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

Change-Id: Ief89028aaabb21be85063cb9ba1e59f84c59419c