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

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

Change-Id: I89d197e67eeba6ec86d0926416d36b7af4a059e8