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

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



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