Merge "Revert "Change mounting storage data and obb flag to on by default""...

Merge "Revert "Change mounting storage data and obb flag to on by default"" into sc-dev am: 1d42095d

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

Change-Id: I558b48ae6f982d430c85ae355f9b8695eb587a33