Merge "Remove /data/misc/vold/user_keys/ce/${user_id} when no longer needed" am: 67db7b9786

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

Change-Id: Ia0ce45874af2fc1b01bf26c56887863d92ade912