Merge "Add missing synchronized(mLock) into Autofill onServiceDied" am: 5e7d4961e6

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

Change-Id: I103e6a0ca533ffbc84fed21307e96a86931447a2