Merge "Fix nullptr exception when using do-while" into main am: 2b7e58cdb7

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

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