Merge "Fix CTS CtsMediaTestCases failed" into stage-aosp-sc-ts-dev