Merge "Add PROPERTY_DOWNGRADED_CONFERENCE to logging" am: 2e0c2171fd

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

Change-Id: I30c6340d335e738b016d1f69f6461951d42b631c