Merge "Merge "Update lint checks to their state on internal master" am: 771f94f7 am: 75575edd am: 128dd429" into udc-dev am: 59a812de am: b014bba0

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



Change-Id: I8c403ad189470963e93fbe5ac12a35b5f94d8c3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>