Merge "Add missing synchronized(mLock) into Autofill onServiceDied"