Merge "Merge "PBAP: Return sim contact size with cursor.getCount" into tm-dev...

Merge "Merge "PBAP: Return sim contact size with cursor.getCount" into tm-dev am: 57347dda am: 3ce35cb9" into tm-d1-dev-plus-aosp am: 72de3fb0 am: b92685b4

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



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