Merge "Merge "Protect all calls to mShortcutHelper with null check" into rvc-dev am: 754636846c am: 4c17382a24" into rvc-d1-dev-plus-aosp