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

Change-Id: I559885c606af44aa0d344dffdd581c5f144bcd11