[automerger skipped] DO NOT MERGE - Merge RQ1A.201205.011 am: d0cc5ece35 -s ours

am skip reason: Change-Id I9e3f763a33892faee0c9f67adc853cb23906df27 with SHA-1 b6db487cce is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13176631

Change-Id: I3106234006b2c6f12a0084f2ae48d6fb1356fc15