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

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



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