Merge "TransformFstabForDsu() skips handling special devices" am: 5ab4400db1 am: fa48a7bac2

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1469562

Change-Id: I471a48b344d1b68c38b8d611e63bfbd02fc6f213