[automerger skipped] Merge "Merge Android R" am: 0bbd9a10 -s ours am:...

[automerger skipped] Merge "Merge Android R" am: 0bbd9a10 -s ours am: fcc43c2c -s ours am: 9e985564 -s ours am: e88bfc12 -s ours

am skip reason: Change-Id Ic54c8dcf210e9b375e7fdce6444c7d882a1784d6 with SHA-1 451a36a9 is in history

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

Change-Id: I3a4a56bbb9ca5b1823319914b94cbbf547f6fd38