Merge "Disable color extraction for media" into pi-dev

author Lucas Dupin <dupin@google.com>

Wed, 7 Mar 2018 17:36:26 +0000 (17:36 +0000)

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

Wed, 7 Mar 2018 17:36:26 +0000 (17:36 +0000)
author Lucas Dupin <dupin@google.com>
Wed, 7 Mar 2018 17:36:26 +0000 (17:36 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 7 Mar 2018 17:36:26 +0000 (17:36 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
Simple merge
author	Lucas Dupin <dupin@google.com>
	Wed, 7 Mar 2018 17:36:26 +0000 (17:36 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 7 Mar 2018 17:36:26 +0000 (17:36 +0000)