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

Merge "NuPlayerRenderer: extend offload pause wakelock duration" into tm-dev am: b116510c am: 0e2e6732 am: 1db48547 am: 2dae7cd5

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



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