Merge "Unfreeze app to trim memory" into tm-qpr-dev am: cac841b3 am: ff96e18e

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



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