Merge changes I3a0066e6,I080a538e into rvc-dev am: 5d0e5f7624 am: 3dca982776
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11420759 Change-Id: I7e0b269e5d46b1fc51eee15b2e530e82c9b1b156
This commit is contained in: