Merge "[automerger skipped] Merge "Fix dismiss callback when keyguard is dismissing." into tm-qpr-dev am: 704b4a2c am: 2c67f7ed -s ours" into udc-dev