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