[automerger skipped] Merge changes Ia5154433,I39275dcc,I879301f3 into...

[automerger skipped] Merge changes Ia5154433,I39275dcc,I879301f3 into rvc-qpr-dev am: 071fce57 -s ours am: f247c8e9 -s ours

am skip reason: Change-Id Ia515443379edb03e68dd2ff5cba07c405aacd433 with SHA-1 271429db is in history

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

Change-Id: I29a8befcd9eb347896e26a594e9c8e144adee0a4