[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: e9a8af53 -s ours am: dadfd3b2 -s ours

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

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



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