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

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



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