Merge "Fix the issue pinned shortcuts went missing after reboot" into tm-dev am: b2aad08e am: 3a028e27 am: 26dcca6b am: ce8d57d1

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



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