Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85 am: cb2b575a9d am: a5d3b8a45c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442 Change-Id: I2657fd8f2674763a59a18c3182cdd8a13d16deae
This commit is contained in: