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

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

Change-Id: I0f35a3db31a6c96f289928dcfdb4596f24a37345