Merge "PBAP: Disable PBAP SIM Feature" am: b90274e5 am: 3f547adf am: 0aa13636

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



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