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

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



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