[automerger skipped] Merge "Baseline Lint FlaggedApi violations" into main am: 37ce7089 am: 8e1de2e8 -s ours

am skip reason: Merged-In I990ce57cd5cdac44ee8b93565b45aa15790ad697 with SHA-1 8589566f is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3131637



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