Merge "Merge "Remove restricted_icon from MainSwitchPreference" into udc-dev...

Merge "Merge "Remove restricted_icon from MainSwitchPreference" into udc-dev am: 55c562fa am: 51780b46" into udc-d1-dev-plus-aosp am: 3e8e8518

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



Change-Id: Ic97f3d5ee3eb36bd932871b08b9e1a7fc43cfcad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>