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

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

Change-Id: I71f3394e1c44c881a5bc346a59c39a1968d0d29d