Merge "Improve removing PROPERTY_IS_DOWNGRADED_CONFERENCE from connection" am: 1a5f580122 am: a4f1ffc59b

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2171284

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