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: ac65e6cf am: 62757b9a am: 04244fa9

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



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