Merge "Add lock on mCallbacks in ServiceBinder"