Merge "Remove broken code for mounting encrypted OBB files" am: 74d9fb9757 am: b643247502 am: 24d38cba52

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

Change-Id: I352c2e9088fee23c8371c080a60fa3854bf77fc5