7dc8d32fd2
There are two separate issues here that need to be fixed, both boil down to the fact that adding an imperative (userSetLocale) to the Configuration is a bad idea. Because of this: - We'd never persist the first user set configuration if it was en_US, because of an erroneous call to Configuration.setLocale. - ActivityManager.getConfiguration would sometimes return a Configuration with userSetLocale == true, which means callers with the right permissions would inadvertently persist a locale they didn't want to persist. bug: 18879010 (cherry picked from commit c63a16b8e46f2f3ecce6c548663cc3185f011fd6) Change-Id: I4d714eb1f75afc0a5bf4d53a374df4ed16e328bf