Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: f4c4ca2327 am: 9c50208f54 am: 7a60fd4cb6

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

Change-Id: I66bd153872bbc1f5f01999fe21705d306bcc7dc9