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

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

Change-Id: Id39d7e567dc2484b859efb10a4d3b2cd696172ba