Merge "PBAP: Disable PBAP SIM Feature" into tm-dev am: 1b936ca0 am: 1d81a2a1 am: 19cb768f

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



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