Merge "Merge "Disable trimMemory(BACKGROUND) on lock with a Flag" into udc-dev am: 42444eff am: fc3ef867 am: 483caa61" into udc-qpr-dev-plus-aosp am: 718083f8

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



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