Merge "Update JIT Zygote image option." am: 6c8544e068 am: f4e1f24f70

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931584

Change-Id: I7282d81fa3fae433a44100bc227a236c6e203f60