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 am: 34d82e51 am: 8eb24657 -s ours" into rvc-qpr-dev-plus-aosp am: 27f336d1 -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: I967006af22239149b1fcc921183a587d21028ca4