[automerger skipped] Merge "Merge Android R" am: 04734ced -s ours am:...

[automerger skipped] Merge "Merge Android R" am: 04734ced -s ours am: 36a4a0ba -s ours am: 4c3beed6 -s ours am: 0c146fb8 -s ours am: 31961c69 -s ours

am skip reason: Change-Id I2813bb3702eed7bd6eea17cf1472a51eec1cbe6e with SHA-1 ce53e793 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/media/+/1422136

Change-Id: If6991ef6494e9a912b797dadf342c9c06b46ab33