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

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

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