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

Change-Id: I7f84cc852a85e14267190b5d828523c9abe4e434