Merge "PBAP: Disable PBAP SIM Feature" into tm-dev am: 1b936ca0 am:...

Merge "PBAP: Disable PBAP SIM Feature" into tm-dev am: 1b936ca0 am: cd69f0c0 am: 49d5ea9e am: 39557cd4

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



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