Merge "[automerger skipped] Merge "DO NOT MERGE Fix testHlsSampleAes_bbb_unmuxed_1500k fail on A-GO project" into pie-cts-dev am: 4a8617cf5f -s ours
am: 51d7fe3126 -s ours
am skip reason: subject contains skip directive

Change-Id: I64afb30a146b072e2e0df16dfe8ba4d5da20da53