Merge "Add lock on mCallbacks in ServiceBinder" am: fa65601a5d am: be57778d04
am: 02b4bc1e22

Change-Id: I210cd7852922fb6b883345f4eb8e8722ad79651d