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: 3b7593a0e7 -s ours
am skip reason: subject contains skip directive

Change-Id: I9f51b26e141f8f1d6d8b680ac538a7f4f5f084eb