Merge "Merge "Reinflate QS view on Locale configuration change" into nyc-dev am: 98c7c05dde am: aa9e0344fd" into nyc-mr1-dev-plus-aosp
am: 7d96c1acb9

* commit '7d96c1acb924b557673e9832c3a5aad93618d10e':

Change-Id: I0425fdc113d7bec351e4e5a54af6b660acbe75b4