Merge "Update lint checks to their state on internal master" am: 771f94f7 am: 75575edd

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



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