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

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



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