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

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



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