Merge "Unset conference state when dng_cnf removed" am: a40bcd1434 am: 098cdccc5b

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

Change-Id: Ie88e7ed91c414461b8eb07d60d2f8a81f4ae2b3e