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

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

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