Revert "Replace cancel button with a delete icon." This reverts commit 02afe9b974b810b8641e845245c5e3397d134bdd. Reason for revert: Delete flow needed polish and ran into some unresolved bugs. Bug: 191889955 Bug: 193246084 Change-Id: I1c1f4dd6d3e9cc0fd3d4642651f679618723404b