Merge "Disable memory trimming on AoD and on unlock" into udc-dev am:...

Merge "Disable memory trimming on AoD and on unlock" into udc-dev am: 11dcac2a am: 13f8f7d9 am: b369547d am: 7ec4e611

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



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