Merge changes from topic "rename-key-dir" am: 9891ae7479 am: b84d773488 am: ab5fbb523d

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

Change-Id: I16c64a5b0b64960c86a5479a1575fb2353170e9b