[automerger skipped] Merge "Import SDK files for lint from build 6500461" am: ed87fbd3e9 am: 9ae7d32ba0 -s ours

am skip reason: Change-Id Ie8e7baf9cf9988969067d4f49df900c43ec59f94 with SHA-1 68d948083b is in history

Original change: https://android-review.googlesource.com/c/platform/prebuilts/sdk/+/1361239

Change-Id: I8dd4b52e23221af07054fef572a60dd9d162340a