Merge "Fix broken tests" into sc-v2-dev am: c07317f5a1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16114300

Change-Id: Ic270be5214f6b795c3345ab88bc895842527f93b