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

Change-Id: If67b04a5e0305f78a1aef38da66ecded3ecab2a8