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: Ifa9b85399519ee9fef577a94ec74c54e3ca586e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>