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

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