Merge "Fix broken test" into sc-dev am: f8641a4d86
am: 2d68db1cef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809883 Change-Id: Ic413813edec0ef2130515fc527b32877587d3bdd
This commit is contained in: