Merge "Fix ShortcutService handling of locale change during device setup."
am: 742048924f

Change-Id: I091a439fd5adc8bd3693af25bcef781bcaf7e2f6