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

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

Change-Id: I20626e2d334ae52396f0b8e50c5dc3cb1556bc1d