Merge "Fix com.android.settings.media test case fail" into rvc-dev