Reapply "Fix broken test caused by misordered callback arguments."

For some reason this change is missing from aosp/master.

Change-Id: I0b73cdf01d1a6796e224add5e5ebc686b0ac95c8
1 file changed