Merge "Set ro.crypto.type even on failure" am: 5350746a2b

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1400948

Change-Id: If30c80f97fbbaf1ba532d45c60d68322acb1fe33