Merge "Fix failing tests" into sc-dev am: 4ee8d6de71 am: 8cb66ec54a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14881549 Change-Id: I63ee5dd9bd18dea1b6aa80d099bd5957e811feea
This commit is contained in: