Merge "servicemanager: Fix loop continue/break" into main am: 6c956266 am: 3f31ab45

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2928570



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