Merge "[People Service] Re-order clean-up to only occur once per shortcuts...

Merge "[People Service] Re-order clean-up to only occur once per shortcuts update" into tm-qpr-dev am: 038e86d8

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



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