Merge changes from topic "update-flicker-annotation" into udc-qpr-dev am: 97199b79

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



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