[automerger skipped] Merge "Restore trimMemory behaviour from T" into udc-dev...

[automerger skipped] Merge "Restore trimMemory behaviour from T" into udc-dev am: 90c9dbf7 am: 2a6a20b6 am: 64577a4a -s ours am: 89b32bf5 -s ours

am skip reason: Merged-In I677855fff144a53d212b65575111491c78803817 with SHA-1 16a1cf9e is already in history

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



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