Merge "Delete the checkin directory with the wrong context" am: 2c48d37a29 am: 821e6c7db4 am: ea28c7cdce

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

Change-Id: I8330072d26bff2f406100c66d46bede7fb436aba