Merge "Add dalvik.vm.force-java-zygote-fork-loop" am: a8540eebc3 am: 12f589735b

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

Change-Id: If85e48ca5743b5fd1bf8e1b36fbcb1372ec1b1f3