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

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

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