[automerger skipped] Merge "Add lint baseline to address NewApi errors" am: c91722d3b1 am: 302a822623 am: 7f37bd676f -s ours

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

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

Change-Id: I38fa1bddcae4183a5cc6818c7150ae817711f2af