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

Merge "Merge "Remove restricted_icon from MainSwitchPreference" into udc-dev am: 55c562fa am: 83f7fa9f" into udc-d1-dev-plus-aosp am: d2a8ba8e

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



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