[automerger skipped] Merge "csip: Expose an extra data with intent and store...

[automerger skipped] Merge "csip: Expose an extra data with intent and store in CachedBluetoothDevice" am: 09170fdb8a -s ours am: 7886c856 -s ours am: 23ed5c83 -s ours

am skip reason: Merged-In I3e99c59e0cb974409291e1b4c28393106784e133 with SHA-1 d6cc3d43 is already in history

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

Change-Id: Id4ad21050eae160e330bfa20392aaf13761e9b41