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

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



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