Merge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a am: 9c885595aa

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

Change-Id: I37f9891ad471db90cddc3640f82655af904758a0