Merge "Correct the permission of checkin dir" am: 9696432564 am: 5901afa842 am: e224d0827f am: e4f192efd3 am: da45b66919

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

Change-Id: I3eaf171268e66eeaac0644ac530f471bf961decf