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

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

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

Change-Id: Id695b5092b0b1afc99e28d7a59f2f8b5bbf726a6