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

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

Change-Id: I2e2b41800da58a057e76c087a0ef5b7e5ff062c1