Merge "OPP: Remove try again button for failed transfer" am: ef542bf7cc

Change-Id: I69fe9a7c5f5a541b714e60bc7ffbef0fb919bfe1