Merge "Temporarily disable a bunch of new linter errors" am: 0f0aaa74ed am: f15d08274e

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1669946

Change-Id: I7845dfff855023ef75854ed6d67342e090b11a57