[automerger skipped] Merge "Include AE Flicker tests to be tracked" into...

[automerger skipped] Merge "Include AE Flicker tests to be tracked" into udc-qpr-dev am: a66a05ab am: 428d8c48 -s ours

am skip reason: Merged-In Idd1cf7584ff45d0e8b1ee31c62fba1330e4f2d81 with SHA-1 60abc5d3 is already in history

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



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