Merge changes from topic "fail-validation-q" into qt-qpr1-dev am: b467f223 am: 0c2d876d

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

Change-Id: Icb2aaa1aaf8006a99ff59d5fff16030785150977