[automerger skipped] Re-Introduce synchronization locking am: 0f74e4e2ee -s ours
am skip reason: Merged-In I5050eb2cbb15bc1245c91efb72e3d4a417f435e5 with SHA-1 15e64537b6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17325489
Change-Id: Ia0aacb28eddc6d82db89d5fa89417bfcff9e424e
This commit is contained in: