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

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



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