Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315 am: 9724c735da am: fc721d09cb am: 94e5b18951 am: 045aa65893

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

Change-Id: I65aef0c493f78d5befdbf2f7dba3455d646c9381