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

Change-Id: I5573733392e04c8f0bee1f170b6b8b760e088235