Merge "Do not extend timeout if not playing" into rvc-dev am: ad26c28c am:...

Merge "Do not extend timeout if not playing" into rvc-dev am: ad26c28c am: d8088e28 am: 1d18f540 am: 053bd00a

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

Change-Id: I15f01da0d313c7bc3c31e312eb80aff19ea92067