Merge "hwc2: add locks for callback functions am: 4c3b62c9a8 am: 21bbd54282 am: 26dff73b59" into rvc-qpr-dev-plus-aosp