am 3b4ccabc: am 4ef9edeb: Merge "Handle policy change while keyguard disabled"...
am 3b4ccabc: am 4ef9edeb: Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev automerge: 65c08ec8
* commit '3b4ccabc':
Handle policy change while keyguard disabled