Merge "Fix test failures" into sc-dev am: ffd695983c
am: 580b659421
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964818 Change-Id: Ia3faf6dc6b52e2209bcee445e8171b6502509e4a
This commit is contained in: