[automerger skipped] Merge "Merge Android R" am: 68f708491a -s ours am: 7f96efdef5 -s ours am: 6d6e7547ce -s ours am: 4083739a06 -s ours

am skip reason: Change-Id Ib76a3f938a240498c6201b01f8b1281624618038 with SHA-1 5166e28294 is in history

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

Change-Id: If4d0c7d8efa795f037565d422d79d1681f08086f