Merge "Merge "Update lint checks to their state on internal master" am:...

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

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



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