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

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

Change-Id: I43149e3979d9b7f1548cd91f50024c9d471096f0