Merge "Ensure create/destroy is called properly for Capability Exchange API"...

Merge "Ensure create/destroy is called properly for Capability Exchange API" into tm-dev am: 4fab7828 am: 798ae24c am: 38ff397e am: 02037369

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/18298868



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