Merge changes from topic "flicker-refactor-assertion" into udc-qpr-dev am:...

Merge changes from topic "flicker-refactor-assertion" into udc-qpr-dev am: 07d1de00 am: 2705f30b

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



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