Revert "Revert "Encrypt phone even if pattern or no keyguard""

Don't block based on keyguard type, and pass type to encryption function.

Requires:
  https://googleplex-android-review.git.corp.google.com/#/c/444201/
or encryption will no longer work.

This reverts commit efec3f2927c45979db2b78e7a6228d08aafb5e42.

Change-Id: I431589a56eb11118027e0a5a84f55e973b1084aa
3 files changed