Merge "Include AE Flicker tests to be tracked" into udc-qpr-dev am: a66a05ab

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



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