Merge "Update lint checks to their state on internal master" into udc-dev am:...

Merge "Update lint checks to their state on internal master" into udc-dev am: b8474e3c am: 7e90ce53

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



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