[automerger skipped] OPP: Fix ANR during retry failed transfer skipped: ce1122f97c

Change-Id: I7425037c2e8c7f10d4b880f8dda3d23f518f7508