Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: f4c4ca2327 am: 44d92fce4d am: 7766abe213

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

Change-Id: I71559142500e3e727a43878555e6a9b69dfc74d5