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

* commit '2309f76d17171a4e9b2593ff248861eb3a41ec5a':
  Don't show UI on default encryption