Merge "Restore trimMemory behaviour from T" into udc-qpr-dev am: cd79634a

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



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