[automerger skipped] Merge "RESTRICT AUTOMERGE Fixed testHlsSampleAes_bbb_audio_only_overridable CTS failure" into oreo-cts-dev am: 72e5b0ce98 -s ours am: e13acb8a40
am: b3d49caa87

Change-Id: Ia6fe7fd0a59a4c1d6ca72af307d31ab40c704fd3