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

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

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