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