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

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



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