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