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

Change-Id: I1408348aa98c9442de544b22cd9cddb9a1eac907