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