aml_tz4_331012050
[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 545f2961b6 -s ours am: 7e248745a2 -s ours am: f9244ffc20 -s ours

am skip reason: Merged-In Ie1510b730a4c573b8e3d970bb3f04d6c4d94e90e with SHA-1 9553356090 is already in history

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

Change-Id: I5288bb3c5d77e666a8a0a5d3d3e34eb4ef314c8f