Merge "Remove broken code for mounting encrypted OBB files" am: a4f24f08b0 am: 56c37e5778

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2003052

Change-Id: I14ae3ace2717e7c09d06e509c51761285a3b84d0