Merge "Fix the callbacks in camera listeners" am: 741f4669f9

Original change: https://android-review.googlesource.com/c/platform/tools/tradefederation/contrib/+/2329657

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