Merge "Fix failed test cases" into rvc-dev am: 1676454b3b
am: 2309e1c188
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207 Change-Id: I1f7b099cc9750618988284b32663de4c236d172f
This commit is contained in: