[automerger skipped] Merge "Re-Introduce synchronization locking" into tm-dev am: c2c9fbe61e -s ours am: 3518e947cb -s ours
am skip reason: Merged-In I5050eb2cbb15bc1245c91efb72e3d4a417f435e5 with SHA-1 d9ad120d95 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17325489
Change-Id: I2899c85df98d8936e1b8f47eac7c250c23a710ae
This commit is contained in: