Merge "Source of deadlock between PlayerBase.mLock and   PlaybackActivityMonitor.mPlayerLock:"