Merge "AOD: Show keyguard indications in white" into oc-dr1-dev
am: ec05633f5f

Change-Id: If3c93807c34241dd5d97502eaf225f14c3527e45