am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks...
am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev
* commit 'a63ba428':
Separate the protection of mProxyServiceStateCallbacks from that of mService