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

[automerger skipped] Merge changes from topic "fail-validation" into rvc-qpr-dev am: 28829eb1 -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/+/13065480

Change-Id: Ic39444a87eac6d2e1569c576918328817a32738b