tree 1412346f9e096bdb745a82b96b04012d42daad97
parent f5ce644a791eb727ffc409c9628f4d12b1938357
parent 5350746a2b7f87560fcb2d89226545ca54e3259f
author Paul Crowley <paulcrowley@google.com> 1597695441 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597695441 +0000

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