Merge "Fix or suppress tidy warnings-as-errors." am: f81decc8b7

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2008647

Change-Id: I110a7ea795e88f893a82d7943cca03cc4c5f2507