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

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

Change-Id: If1b7949d833427946f7ca11f0f609ece26dbc918