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: 47e616fd

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



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