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