[automerger skipped] Merge Android R am: 0c52cbf7cf -s ours am: d95dac3354 -s ours

am skip reason: Change-Id I0840ec224cd0e2d3c5573f884c4388579f2ee76a with SHA-1 1e442be16e is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/display/+/1422316

Change-Id: I14cd529d07b80c4f9bdb2018997ab3694ce7a786