[automerger skipped] Add Android/data mounting along with obb mounting in vold am: c1e33a3cc9 am: 093ad3e681 am: 5e8987af6e -s ours

am skip reason: Change-Id I26dc3756aa5843b85565495e9c2698130113f49a with SHA-1 c1e33a3cc9 is in history

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

Change-Id: I90fe86ef5bee702a5a89f708d79a4d0d3cf9205b