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