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