Merge "Add lint baseline to address NewApi errors" am: ba0fbb2ed0 am: 5715d5e802

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

Change-Id: I22090464cebfd7ba9c33500bab19aaba0bcec1c0