From: Lucas Dupin <dupin@google.com>
Date: Mon, 21 May 2018 19:36:44 +0000 (-0700)
Subject: Merge "Keep scrim black when "always on" is off" into pi-dev
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1c63bdcce2;p=android-x86%2Fframeworks-base.git

Merge "Keep scrim black when "always on" is off" into pi-dev
am: 402e2a2b6f

Change-Id: Iecc4ff6e4f1861e8adec33e912d71be051ccb98d
---

1c63bdcce287ad36ccfa549193636ab149109409