Merge "Fix the callback status" into main am: 23564a4a26 am: 64830afdcb am: 98eed29561

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

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