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

* commit '53a1bd9f932c16d90fa4ece89c1fcf5a532c1766':
  Use custom theme for keyguard presentation