[automerger skipped] Merge "PBAP: Add PBAP SIM Feature" am: 09b0d119 am:...

[automerger skipped] Merge "PBAP: Add PBAP SIM Feature" am: 09b0d119 am: a468cb0b am: f6fb912a -s ours am: cfa7967d -s ours

am skip reason: Merged-In I823b8d7b972bcb251944fb70b734fc23955f6470 with SHA-1 3234dcf0 is already in history

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



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