Merge "AOD: Do not show guts nor snooze" into oc-dev

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

Tue, 18 Apr 2017 00:07:58 +0000 (00:07 +0000)

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

Tue, 18 Apr 2017 00:08:05 +0000 (00:08 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Tue, 18 Apr 2017 00:07:58 +0000 (00:07 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 18 Apr 2017 00:08:05 +0000 (00:08 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Tue, 18 Apr 2017 00:07:58 +0000 (00:07 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 18 Apr 2017 00:08:05 +0000 (00:08 +0000)