Merge "[automerger skipped] hwc2: add locks for callback functions am: 148e622efb -s ours am: bcd32a9950 -s ours am: 0449f62e1f -s ours am: 5cbc702a2f -s ours" into rvc-qpr-dev-plus-aosp