[automerger skipped] Merge Android R am: 7a251f0a63 -s ours am: 498ccd3367 -s ours

am skip reason: Change-Id I6572157ab6f75fefb67d7fbc24e9529df8c17743 with SHA-1 acb4b2d440 is in history

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

Change-Id: I3f73c354708e270c6c8f0e3095f1668eef7f13bb