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

[automerger skipped] Merge "Add lint baseline to address NewApi errors" am: 14d33340 am: d3586397 am: ae40a1f4 -s ours am: c992ade6 -s ours

am skip reason: skip tag Change-Id Icad8b3457cb3cc71880a300b105a20dbb557e146 with SHA-1 a2d4c960 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Contacts/+/1675528

Change-Id: I5e37937ecd58e801cf817665a2c4477a58be855a