Merge "[People Service] Remove conversations without corresponding shortcuts in ShortcutManager" into tm-qpr-dev am: 95f66759ac

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

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