[automerger skipped] Merge "Add lint baseline to address NewApi errors" am:...

[automerger skipped] Merge "Add lint baseline to address NewApi errors" am: c91722d3 am: 302a8226 am: 7f37bd67 -s ours am: 9def6bf7 -s ours

am skip reason: skip tag Change-Id Ide8a8fe80ba31396f23853ab266afcbcc33af9a6 with SHA-1 d34f536b is already in history

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

Change-Id: I3f941de997e516c4a94899a6220bfe6ff018c17a