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: 7890859b

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

Change-Id: I085d0c37268fc7db271498c6f922801f0b7b07a7