[automerger skipped] Merge changes from topic "fail-validation-q" into...

[automerger skipped] Merge changes from topic "fail-validation-q" into qt-qpr1-dev am: b467f223 am: 0c2d876d am: 6b21e637 -s ours am: f4cf24c0 -s ours

am skip reason: Change-Id If840f35245c2d049401d0d2f6539fe8c4625151e with SHA-1 37daf1ba is in history

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

Change-Id: Ia8410072f23862bc138db91ea54a3b647e82de47