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: d2a259a6

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



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