Merge "Revert "Replace cancel button with a delete icon."" into sc-dev am:...

Merge "Revert "Replace cancel button with a delete icon."" into sc-dev am: 9bdcb467 am: c7e9ccf6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15246355

Change-Id: I734dea799e0eb3bc5ad48d185b7346db380e9d40