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

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



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