[automerger skipped] Merge "TopLevelStoragePreferenceControllerTest converted to JUnit" into sc-dev am: cd60664cc3 am: 9cf34b18b5 am: d89bc5c2ec -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: Ia0984ea137c3862d0ce7d15a8101bed2619836e3
This commit is contained in: