Android mainline 11.0.0 release 18
[automerger skipped] hwc2: add locks for callback functions am: 9bac9d39bb -s ours am: 2dae04e9a8 -s ours

am skip reason: Change-Id I3b29c2e17f3a8968348d0d0a29feaca287d4c72c with SHA-1 ccf7cd3bf2 is in history

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

Change-Id: I9b5c0e20d2fc6dcd4226b126bdab44d6399ef0f6