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

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

Change-Id: I0b5e54b91dc020776625a6818acb99c7ee458392