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: ae5de253 am: 7f278063 am: 3ddae1f8

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

Change-Id: I866fb40d9ee859b76609cba5e838b9773fdc21e9