[automerger skipped] Merge "Add lint baseline to address NewApi errors" am: ba0fbb2ed0 am: 5715d5e802 am: 81d06eb00d -s ours

am skip reason: skip tag Change-Id I994630133d86cedb7f10eb51282dad0071df0d87 with SHA-1 6955c51641 is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/1675569

Change-Id: Ied9cd84b35a2e03ac569ad72f6c494ff28b910ad