Merge "[automerger skipped] hwc2: add locks for callback functions am: 9bac9d39bb -s ours am: 2dae04e9a8 -s ours am: d213a17cc1 -s ours am: 83d01ad781 -s ours" into rvc-qpr-dev-plus-aosp