Merge "Update JIT Zygote image option." am: 6c8544e068 am: f4e1f24f70 am: 9030aacbc2 am: 9f617fda43

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

Change-Id: I423c59dc5436bbbb7a6bb235f3ad64aec2db2d8b