Merge "Merge "NuPlayer::GenericSource::onPrepareAsync():Change lock order mLock and mDisconnect lock order interleaving, which has potential risk of deadlock if other code locks/unlocks them in a different order." into qt-dev am: c6ad7d76 am: 51dbe482" into qt-r1-dev-plus-aosp
am: e40a76a3

Change-Id: I3371140caeea8e6993f8fa5862191fba5d517d25