Merge "Use lint database from api_version_public" am: 39ebb3b0c0 am: d708548986

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

Change-Id: Ic7554fcb2a7ce3708354ac934b2e636d36e0e23e
Signed-off-by: Automerger Merge Worker <[email protected]>