[automerger skipped] Merge "Baseline Lint FlaggedApi violations" into main am: fa87f0327b am: 5f27505722 -s ours

am skip reason: Merged-In I990ce57cd5cdac44ee8b93565b45aa15790ad697 with SHA-1 6ea2a8b07f is already in history

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

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