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

[automerger skipped] Merge "NuPlayer: use acquireWakeLockAsync in AWakeLock" into tm-dev am: 0b6f7b00 am: e2187f89 am: f4f50286 -s ours am: 56bc8372 -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: I3d62f9698fcf0f6c3e5016f46c54e03c1e49ca53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>