[automerger skipped] Merge "Monitor fold to AOD latency" into tm-qpr-dev am: 560e645f3a am: e8359bcd81 -s ours

am skip reason: Merged-In I67e0e04bbc24064640f46cdc8feb667814170529 with SHA-1 d1d10d9909 is already in history

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

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