am 58b4cc4d: am dcf5a663: Merge "Read in the disable-keyguard-features flag...
am 58b4cc4d: am dcf5a663: Merge "Read in the disable-keyguard-features flag from the XML file" into jb-mr1-dev
* commit '58b4cc4d':
Read in the disable-keyguard-features flag from the XML file