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