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

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

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