[automerger skipped] Re-Introduce synchronization locking am: 0f74e4e2 -s...

[automerger skipped] Re-Introduce synchronization locking am: 0f74e4e2 -s ours am: 3badc69f -s ours

am skip reason: Merged-In I5050eb2cbb15bc1245c91efb72e3d4a417f435e5 with SHA-1 d9ad120d is already in history

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

Change-Id: I5000c1aa6844204a1e0aec880c3e874b2e6ed8dc