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

Change-Id: I2a6974b7be820226e3c10c62e9ad4abbaaef5953