Merge "Fix the issue pinned shortcuts went missing after reboot" into tm-dev am: b2aad08e am: a73badef am: ff83c33c

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



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