Merge "Fix RestrictedPreference icons do not align view state" into...

Merge "Fix RestrictedPreference icons do not align view state" into udc-qpr-dev am: 18d0e96e am: 918d7659

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



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