Merge "framework: SystemUI: add tracing to Keyguard" into nyc-mr1-dev