Merge "Revert^4 "Customize StubVolume implementation for ARC"" am: 69c97b6d12

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I726bc94861fb18e38501ce30ee4d77d2d08eddc0