Merge "Avoid compacting when app has foreground activities" into tm-dev am:...

Merge "Avoid compacting when app has foreground activities" into tm-dev am: a2d26585 am: b601fd8a

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



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