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

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



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