[automerger skipped] Merge "TopLevelStoragePreferenceControllerTest converted to JUnit" into sc-dev am: cd60664cc3 am: 9b448ebdb9 -s ours
am skip reason: Merged-In Ia22ebac4baec60f72b8516e9e79998cd788266ab with SHA-1 8e712c1501 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410005
Change-Id: I1d0b5d6c1d44e469fbd5579d3e07f94c559f6ef5
This commit is contained in: