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

Merge "Revert^3 "init: Look for super partition only on a boot device"" into main am: c33584e2 am: 65e356a0

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



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