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: 9d485fc1

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

Change-Id: I828a236365ea150b76e15a4066b99d046d2b2743