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

Merge "Merge "Avoid compacting when app has foreground activities" into tm-dev am: a2d26585 am: b601fd8a" into tm-d1-dev-plus-aosp am: 104645f6

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



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