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