Merge "fscrypt_test: add test for parsing of "aes-256-hctr2"" am: 7c14d61154 am: a46022f7aa am: 8f6ceb1253

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2468181

Change-Id: I538e60557dfa683a932b9da52121fc263173772e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>