* commit 'd67aff686d467c439970aef4a57a29838bf005c2': Separate the protection of mProxyServiceStateCallbacks from that of mService
* commit 'd67aff686d467c439970aef4a57a29838bf005c2': Separate the protection of mProxyServiceStateCallbacks from that of mService