[automerger skipped] Merge changes from topic "fail-validation-rvc-plus-aosp" into rvc-qpr-dev-plus-aosp am: aa7d6d0e52 -s ours

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

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

Change-Id: I256a0ffc4e1b015fd09cdc0f449b83936c61b723