Merge "Remove unnecessary interactive check from alarm dumpsys"

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

Sat, 10 Feb 2018 02:05:28 +0000 (02:05 +0000)

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

Sat, 10 Feb 2018 02:05:28 +0000 (02:05 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Sat, 10 Feb 2018 02:05:28 +0000 (02:05 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 10 Feb 2018 02:05:28 +0000 (02:05 +0000)
diff --cc services/core/java/com/android/server/AlarmManagerService.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Sat, 10 Feb 2018 02:05:28 +0000 (02:05 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 10 Feb 2018 02:05:28 +0000 (02:05 +0000)