Merge "Call GetDsuMetadataKeyDir() for DSU metadata encryption dir" am: 346e6792b4 am: 99436bf2aa am: 4c22f00ec1 am: f5d57aefc0

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1452359

Change-Id: Ib2e946482de1cae5dbc42cdf37ef31d961b55289