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

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

Change-Id: I7218492220f54a3b3e1e7d206005d23a713f4713