Merge "Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE Fixed testHlsSampleAes_bbb_audio_only_overridable CTS failure" into oreo-cts-dev am: 72e5b0ce98 -s ours am: 256ed011af -s ours am skip reason: subject contains skip directive" into pie-cts-dev