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

* commit '1cca7114cd8ef2bd2029e87fc53a71b4f916df03':
  Don't show UI on default encryption