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: 582602a8 am: c6f6c929

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

Change-Id: I6ffd4f538a70b972260bcf243f2af21d7b6b9ef7