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

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

Change-Id: I5334a64345ca86fb4b4d4ad235e14b79809ef8e6