Merge "Make LauncherApps#ShortcutQuery#setLocusId() public" into rvc-dev am: bcaa266fa7

Change-Id: Ia363f9552ebeec80b2ab1490cc2200840f67412b