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: 3882212b am: 5a439174

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

Change-Id: Ie98efb20b3f379125cdb10c89bd6fa3e4641ce88