Merge "Don\'t show UI on default encryption" into mnc-dr-dev am: 2309f76d17
am: 01a856d5ca

* commit '01a856d5ca99d2c51382de57c02c053d3de88c7d':
  Don't show UI on default encryption