Merge "Execute pause timeout only when attached to a process" into tm-dev am:...

Merge "Execute pause timeout only when attached to a process" into tm-dev am: bdeddd76 am: a1f39bcc am: b79a50bc

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



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