Merge "Merge "Add caching for {Map,Sap}.getConnectionState" into tm-dev am:...

Merge "Merge "Add caching for {Map,Sap}.getConnectionState" into tm-dev am: ea5dd33b am: 6e98a721" into tm-d1-dev-plus-aosp am: b1d76572

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



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