[automerger skipped] Avoid PushLocalFrame(0) CHECK failure am: dd6f7c6962 -s ours am: 7670b4c66c -s ours

am skip reason: Merged-In Id4bb3b6bb2f52ff0c3e78f13326405dac06de730 with SHA-1 6e9408c407 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/18242554

Change-Id: I8ad4f89322a571cc4c0f7a1fc93f5e04127e4574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>