Merge "Add a global setting to turn on/off the proc state cpu times tracking."

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

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

diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge