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

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