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

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

Change-Id: Iebc830bc01a54ce1292cf98f5c7905adcea55b5f