Merge "Add missing synchronized(mLock) into Autofill onServiceDied" into sc-dev