Merge "Merge "Fix failed test cases" into rvc-dev am: 1676454b3b am: 2309e1c188 am: 3261d992cc" into rvc-qpr-dev-plus-aosp am: 8c48773858 am: 1ab4281ad0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207 Change-Id: I5d983b5be74390167f1f8f1f62ddf6fc078a412d
This commit is contained in: