Merge "Hide demoted conversations from People service" into sc-dev am: fa2a032d am: 038fa1b3 am: d36bae87

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

Change-Id: I675b82c9bdfbf0dead59ce687ea883763b98de65