Merge "Exit the loop after confirming the id" into main am: 799d4cc47b

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

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