Merge "fs_mgr: Don't assume partitions replaced by DSU are logical already" am: 243df2d917 am: 3e98167a22 am: 7eae39fdc4

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

Change-Id: I2ee9681028a9ffbc9a7cb13ab1ce453a0413742a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>