[automerger skipped] Merge "Remove hidden connectivity methods access" am:...

[automerger skipped] Merge "Remove hidden connectivity methods access" am: 3e737c11 am: 0080dfa6 am: 6c7f7090 -s ours

am skip reason: skip tag Change-Id Iec4dab5d9fa12dedcf69a1cfe2a8be0956bc0d79 with SHA-1 003e27d1 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1644546

Change-Id: Ic929f6b4eeaadff3d540184588050b57b88fccfa