Merge "Don\'t show UI on default encryption" into mnc-dr-dev am: 2b216aa89b
am: ba1d268273  -s ours

* commit 'ba1d268273afdb954564fb5d75700cbe93a5dcac':
  Don't show UI on default encryption