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

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

Change-Id: Ia1fd614583176ced6135b8dfb4be8760273d9eec