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

Change-Id: Ied0457249c906d7df5e85fa26180f1671d94913c