Merge "AudioPlaybackConfiguration: prevent race condition on mIPlayerShell" into oc-mr1-dev am: 982ee8e6c3
am: 2d7ef64f47

Change-Id: Ib4bd34bf0915afdd3e6c91c2ad34594e1e373a36