Merge "Skip boot prompt for both native and emulated FBE." into nyc-dev

am: ba3786c1e1

* commit 'ba3786c1e1e50e3b67cd1b675fade84dee192708':
  Skip boot prompt for both native and emulated FBE.

core/java/com/android/internal/widget/LockPatternUtils.java

@@ -896,8 +896,7 @@ public class LockPatternUtils {
      * @return true if device is file encrypted
      */
     public static boolean isFileEncryptionEnabled() {
-        final String status = SystemProperties.get("ro.crypto.type", "");
-        return "file".equalsIgnoreCase(status);
+        return StorageManager.isFileBasedEncryptionEnabled();
     }
 
     /**