Merge "Fix the callback status" into main am: 23564a4a26

Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/2825812

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