[automerger skipped] Merge "Code cleanup in ZygoteConection.java" into qt-dev-plus-aosp
am: d99d8d79ae -s ours
am skip reason: change_id I56bff2aaae4ff98c687cb2c2998f857cfdc86295 with SHA1 1f26331df0 is in history

Change-Id: Icf441f0eda0038d0d9b090c8962fda53285e2ac5