Merge "Fix com.android.settings.media test case fail" into rvc-dev am:...

Merge "Fix com.android.settings.media test case fail" into rvc-dev am: 334985fe am: 1431d764 am: 1388e136

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970205

Change-Id: Icd77cc1c5a0cbd2d7ad7e05d4f8318f26ef3c6c0