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