[automerger skipped] Grab lock before reparenting in SurfaceFlinger...

[automerger skipped] Grab lock before reparenting in SurfaceFlinger commitMirrorDisplays() am: 2cf827fa am: 0768a957 -s ours

am skip reason: Merged-In I45384210791bd9280f63d95e3bdaef3d299fc818 with SHA-1 9cba62a0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/22214934



Change-Id: Ia149e7627d991f20b46ba2e0f7eb150a476af2a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>