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

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

Change-Id: I6ce421b3b41858f94f759821d52973e2047eb1f9