Merge cherrypicks of ['android-review.googlesource.com/3380291'] into sparse-12723046-L97500030008075518.
SPARSE_CHANGE: I69e5f8879119f17ffa6740e3d67c437fe7fa938e

Change-Id: I362ba99872c2fbdae3ce6c9183dca89d6e99c314
diff --git a/aosp/dynamic_partition_control_android.cc b/aosp/dynamic_partition_control_android.cc
index 363a433..d1c3bf2 100644
--- a/aosp/dynamic_partition_control_android.cc
+++ b/aosp/dynamic_partition_control_android.cc
@@ -298,7 +298,6 @@
       target_partition_name.ends_with("_b")) {
     auto slot = target_partition_name.ends_with("_a") ? 0 : 1;
     device_name = GetDeviceName(target_partition_name, slot);
-    return false;
   }
   if (DeviceMapper::Instance().GetState(device_name) !=
       DmDeviceState::INVALID) {