[automerger skipped] Merge "(Re-Introduce locking)[TEMP] Re-Introduce...

[automerger skipped] Merge "(Re-Introduce locking)[TEMP] Re-Introduce synchronization locking" am: 14087b39 am: b646fcd6 am: 9723c613 am: 1283caac am: 9f62497f -s ours

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

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

Change-Id: Ie2df755589e52e53ba5e5fd142dbefdca33f390c