Merge "Disable memory trimming on AoD and on unlock" into udc-qpr-dev am: 779d34b0 am: 031d6558

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



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