[automerger skipped] Merge "Modify ContentProfileFileName enum" into main am:...

[automerger skipped] Merge "Modify ContentProfileFileName enum" into main am: 241f4387 am: 2912d6ca -s ours

am skip reason: Merged-In If488b9f5ae1f027a0a0879477c611f2161dd21ae with SHA-1 8c86c62b is already in history

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



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