Merge "Revert "NuPlayer: use acquireWakeLockAsync in AWakeLock"" into tm-dev