Merge "Update JIT Zygote image option for installd and otapreopt." am: 9a869c9c1f am: 1f6dbdcf37 am: 2556fc0a6d am: fcf748dbd4

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1931837

Change-Id: I50aea9bb77f184f18a69b9ea784f269b6d2c373a