aml_tz2_303900102 (9423707,com.google.android.tzdata2)
[automerger skipped] hwc2: add locks for callback functions am: f0360a1db2 -s ours am: 3ddcbd6d99 -s ours

am skip reason: Change-Id I9ae8ac8968f4ff9286846de15df0411b5d79ae63 with SHA-1 4066437857 is in history

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

Change-Id: I85e92d68a0d19547c44efda02ef424754d5aa3cf