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: 62878a8f

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



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