Merge "Read local cache directly if bonded" am: 2a309288 am: 16548695 am:...

Merge "Read local cache directly if bonded" am: 2a309288 am: 16548695 am: f53123bf am: 50d34581 am: 1f9694d1

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



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