Merge "[People Service] Remove conversations without corresponding shortcuts...

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

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



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