Merge "[automerger skipped] Merge "Add back missing `tidy_checks`, since...

Merge "[automerger skipped] Merge "Add back missing `tidy_checks`, since `tidy_checks_as_errors` isn't enough" into rvc-dev am: a80c586d -s ours am: 6aedfe30 -s ours am: 3cb291b4 -s ours" into rvc-qpr-dev-plus-aosp am: 79925d2f -s ours

am skip reason: Change-Id If69f69bf7861ba3569756270381f3f737366f2f0 with SHA-1 cb6c91bc is in history

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

Change-Id: I09c4ba7702d453b8f6a77a6b02cc44655fdd557c