Merge "servicemanager: Fix loop continue/break" into main am: 6c9562662e

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

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