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