Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev