Merge "Add lock on mCallbacks in ServiceBinder"
am: fa65601a5d

Change-Id: I9ee0b5ea63c7344b73c11b1a684b0958e5615a30