Merge "Make simg2img host-only" into main am: 5aa25bf3ae

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

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