Merge "Monitor fold to AOD latency" into tm-qpr-dev am: 560e645f3a

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

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