am 3ed4564c: am 0fd69144: am e86f1752: Merge "Use custom theme for keyguard presentation" into mnc-dev

* commit '3ed4564c4f1b1c60d83594ae6d0a242b4fb27f6f':
  Use custom theme for keyguard presentation