Merge "Merge "Use lint database from api_version_public" am: 39ebb3b0 am:...

Merge "Merge "Use lint database from api_version_public" am: 39ebb3b0 am: d7085489" into tm-dev-plus-aosp am: c3b789f8

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



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