am c5aa0ab2: am ba551061: Merge "Don\'t clip keyguard security container children (e.g. glow pad)" into klp-dev

* commit 'c5aa0ab2e8c47f0d16077abec1531998fbc5b415':
  Don't clip keyguard security container children (e.g. glow pad)