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

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

Change-Id: I74db3df0d425143fb17f7818ca34302281a2224a