Merge "Fix com.android.settings.media test case fail" into rvc-dev am: 334985feab
am: 3882212b26
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970205 Change-Id: I2c708d38674d08ed45410a931ca598cb4bd244ec
This commit is contained in: