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" into udc-dev-plus-aosp am: 931990c9 am: 0d329aaa

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



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