Merge changes from topic "pbap-client-contacts-caching...

Merge changes from topic "pbap-client-contacts-caching pbap-client-storage-refactor" into main am: 0f0e1d72 am: c42ce5a2

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



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