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: I6bd518dfcc82dffde8846a3e076df5e76b5317ff