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

Change-Id: I28ebbab625d12faeea4c3a9676dd73fc9f092b20