Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: f4c4ca2327

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

Change-Id: I09d21b8405050e4ef1474444ca5ec0b7f71406be