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