Merge "Extreme battery saver: Force background check on all apps"

author TreeHugger Robot <treehugger-gerrit@google.com>

Wed, 29 Nov 2017 00:43:29 +0000 (00:43 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 29 Nov 2017 00:43:29 +0000 (00:43 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Wed, 29 Nov 2017 00:43:29 +0000 (00:43 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 29 Nov 2017 00:43:29 +0000 (00:43 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Wed, 29 Nov 2017 00:43:29 +0000 (00:43 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 29 Nov 2017 00:43:29 +0000 (00:43 +0000)