Merge "Move the cached app high watermark logging before the modern trim flag"...

Merge "Move the cached app high watermark logging before the modern trim flag" into udc-dev am: c30cfa0b am: 09177545 am: c2f15def

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



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