Merge "[automerger skipped] hwc2: add locks for callback functions am: f0360a1db2 -s ours am: 3ddcbd6d99 -s ours am: ce4343bd3d -s ours am: c3d15c4344 -s ours" into rvc-qpr-dev-plus-aosp am: 8cf0258fc5 -s ours

am skip reason: Change-Id I9ae8ac8968f4ff9286846de15df0411b5d79ae63 with SHA-1 f0360a1db2 is in history

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

Change-Id: Id3c6ba3a2d4c984b14e37aa755ea664819abb60f