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

* commit '2b216aa89b76dbadb315322e4fd31aa37059b262':
  Don't show UI on default encryption