Merge "Suggest running gdb-remote again on failure" into main am: ebeb143d07 am: 4f87ed7390

Original change: https://android-review.googlesource.com/c/platform/development/+/3001350

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