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

Merge "Merge "Disable memory trimming on AoD and on unlock" into udc-dev am: 11dcac2a am: 13f8f7d9 am: 1932da96" into udc-qpr-dev-plus-aosp am: 77924a59

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



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