Merge "Revert^2 "init: Look for super partition only on a boot device"" into...

Merge "Revert^2 "init: Look for super partition only on a boot device"" into main am: 0508b53f am: 4550dd67

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



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