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

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

Change-Id: Ifd038592b11c23c74bc21320f2d2963be7711a1d