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

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

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