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