Merge "[automerger skipped] Merge "Add dalvik.vm.force-java-zygote-fork-loop"...

Merge "[automerger skipped] Merge "Add dalvik.vm.force-java-zygote-fork-loop" into sc-dev am: aa83e6ae -s ours am: e7ae4a9d -s ours" into sc-v2-dev-plus-aosp am: 27b53bc4 -s ours

am skip reason: Merged-In Ia46a011125a6e245bbd9065d708d1f905d56e3af with SHA-1 01bc0364 is already in history

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

Change-Id: If5f5a232ac2a37ca5f0145bc9f9af6efc0132174