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

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



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