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

am skip reason: Change-Id I52a48b49f5cc2e48fc89e4ced7bf59648ab4e9d1 with SHA-1 4c3b62c9a8 is in history

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

Change-Id: Idf5ab9980731889c38299c4749979ca928739c08