Merge "Fix the issue pinned shortcuts went missing after reboot" into tm-dev...

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

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



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