Merge "Move from an alert dialog to a full screen dialog for SIM app install"

diff --cc api/system-current.txt
Simple merge

diff --cc core/java/android/provider/Settings.java
Simple merge

diff --cc core/res/res/values/config.xml
Simple merge

diff --cc core/res/res/values/strings.xml
Simple merge

diff --cc core/res/res/values/symbols.xml
Simple merge

diff --cc core/tests/coretests/src/android/provider/SettingsBackupTest.java
Simple merge