Merge "Merge "AOD: Show keyguard indications in white" into oc-dr1-dev am:...
Merge "Merge "AOD: Show keyguard indications in white" into oc-dr1-dev am: ec05633f am: bbef8631" into oc-mr1-dev-plus-aosp
am: ef3fb5c6
Change-Id: Ie565e03e52ba8c2aa281b74781f3a12e4c1e8441