[automerger skipped] Merge "Demote Lint FlaggedApi violations to warnings" into main am: bafef27212 am: 681e51f1b4 -s ours

am skip reason: Merged-In I84a309f52c828e72e8bcdc43c7492a451d25b87f with SHA-1 3b1ec475e7 is already in history

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

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