Merge "Merge "hwc2: add locks for callback functions" into rvc-dev am: fbed8adaff am: b5a53e513c am: d0e50d770f" into rvc-qpr-dev-plus-aosp am: 68aeb00723

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

Change-Id: I3097e0b1b1141d9f482b94ec79f18a2cc92e9e20