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

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

Change-Id: I00117ec751f2e097e11dca61c9bb25e37e6b3016