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 am: 481c92f5 am: 747d880e am: 207c026d

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



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