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

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

Change-Id: I60dcf183e03d46fc8a526bd36b19c97ad7dcead3