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

Change-Id: I1d3e2a37f246cea5bb45d4e3a1c33dfd44605466