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