[automerger skipped] Merge "Remove unnecessary --api-lint-ignore-prefix...

[automerger skipped] Merge "Remove unnecessary --api-lint-ignore-prefix options" into udc-mainline-prod am: 4ba29648 -s ours

am skip reason: Merged-In Ife750c586edc2b5af92c0b5e9211b23345083f69 with SHA-1 48fefdd2 is already in history

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



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