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

Change-Id: I16094b1ad6be83f80a528e9aa66654595fab1023