Merge changes from topic "metadata_encryption_options" am: 10ca7def20 am: 09c6fcafa0 am: 5a91b7151e

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2030589

Change-Id: I094284b2d4b5667a845460b2fd05e07e0ec149fe