Merge "Fix stack overflow bug" into main am: 18f792fed9

Original change: https://android-review.googlesource.com/c/platform/development/+/3506419

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