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

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



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