[automerger skipped] Merge "Add missing synchronized(mLock) into Autofill onServiceDied" am: 5e7d4961e6 am: 591ae1c7b4 am: c69b41b6b0 -s ours

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

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

Change-Id: I0207b595c82f4170a79ed6375055bbdc83279b46