Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb3 am:...

Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb3 am: 9724c735 am: fc721d09 am: 94e5b189 am: 045aa658 am: 9ebe07d2 am: 63cc6f16

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

Change-Id: Iedfec3d03168c06279513180f28364c19ff66523