[automerger skipped] Merge "NuPlayer: use acquireWakeLockAsync in AWakeLock"...

[automerger skipped] Merge "NuPlayer: use acquireWakeLockAsync in AWakeLock" into tm-dev am: 0b6f7b00 am: a55077ea -s ours am: a6f1b742 -s ours

am skip reason: Merged-In Ice44a818c8c18e42008eb5271d37d263fee57484 with SHA-1 781a7fd3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/19034945



Change-Id: I16f02c323f44c9994003b0319ff9d1ee9367f944
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>