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: If2d4c369a47fb9a453326295c306ca232a380c78
This commit is contained in: