[automerger skipped] Merge "Add lint database filtering tool" am: f9eb7b94...

[automerger skipped] Merge "Add lint database filtering tool" am: f9eb7b94 am: 270c84ec -s ours am: f4af8351 -s ours

am skip reason: Merged-In Ic45db0b71a2f13dc456463ce04b2f7744a0e330c with SHA-1 b91f45d6 is already in history

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

Change-Id: I163f5aa2af14ffb80698cc4ae44f11db7cc88ea5