Merge "NuPlayerRenderer: extend offload pause wakelock duration" into tm-dev...

Merge "NuPlayerRenderer: extend offload pause wakelock duration" into tm-dev am: b116510c am: 8e49253e am: 7dfee41b am: 4b644133

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



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