Merge "Move bitmap saving into corresponding ShortcutPackage" into tm-dev am: 5f8a0114

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



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