[automerger skipped] Merge "HFP: use Bundle to query call log and phonebook"...

[automerger skipped] Merge "HFP: use Bundle to query call log and phonebook" into rvc-dev am: 23a334da am: 17693343 -s ours am: d604c6af -s ours am: 54bd2a14 -s ours

am skip reason: Merged-In I9dac26fb34d974d5a8e7f60d1ce609201e1d2ecf with SHA-1 c16bc315 is already in history

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

Change-Id: I63b6f0682588feeefa76265a1cb2afa4a77c16b8