Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85 am: e790b378c3 am: 8be84e5e36 am: dff59b4188 am: 067fff3ae6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442 Change-Id: I9e1b580516e95731aea2fc0d187f3b3c5ff80c07
This commit is contained in: