Merge "emulator: do not enforce 8G system image partition" am: 7012508b am:...

Merge "emulator: do not enforce 8G system image partition" am: 7012508b am: 7624c44f am: 50fd1924

Original change: https://android-review.googlesource.com/c/platform/build/+/2393534



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