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

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

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