Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315
am: 9724c735da
am: fc721d09cb
am: 94e5b18951
am: 045aa65893
am: 9ebe07d216
am: 63cc6f167a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449 Change-Id: Iedfec3d03168c06279513180f28364c19ff66523
This commit is contained in: