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

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

Change-Id: I53066586620a318a332936310ddba142fd56386d