Merge "OPP: Fix ANR during retry failed transfer"
am: f21731af03

Change-Id: I3f03696acf67847f99caf224ac1f55979a0dc749