Merge "Add GetDsuMetadataKeyDir()" am: adb1b891a8 am: 76621fa1e5

Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1452416

Change-Id: I3f8e4eb2de34011098241caea16837bf85dcf4dc