Merge "Add api to change charging state update delay"

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

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

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