Merge "Added shortcutlauncherdemo Initialization provider" am: 270b7c9fed

Original change: https://android-review.googlesource.com/c/platform/development/+/2585516

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