[automerger skipped] Merge "Add missing synchronized(mLock) into Autofill...

[automerger skipped] Merge "Add missing synchronized(mLock) into Autofill onServiceDied" am: 5e7d4961 am: 591ae1c7 am: c69b41b6 -s ours am: 24731368 -s ours

am skip reason: skip tag Change-Id Ic16ed5e4ac507f02e56f9e9cd94d4b4cfb028d69 with SHA-1 476cacb0 is already in history

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

Change-Id: I27a40176fb01616693e7c4d25978c3d2b32ae5b5