Merge "Add PROPERTY_DOWNGRADED_CONFERENCE to logging" am: 2e0c2171fd am: ff4a4a29e7

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

Change-Id: Ie04c3faf2011718784b36dcc7249bbca1698f08c