Merge "Add CachedBluetoothDeviceManager test case for csip set member device logic" am: 7e32693bc7 am: 252d8842e6 am: bbb8fa8e83

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1922038

Change-Id: Iddaf052956d62ada185adbb55d493fafacd5172f