Merge "Fix crash when unpairing a device which supports CSIP" into udc-qpr-dev am: b49dc675

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



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