Merge "fs_mgr: Copy the blk_device from start_idx to current index" am: 3eb67e88 am: f9c8dce0

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



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