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