Merge "init: Look for partition only on a boot device if using boot_part_uuid"...

Merge "init: Look for partition only on a boot device if using boot_part_uuid" into main am: c43fd515 am: c4c178ba

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



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