Merge "Replace cancel button with a delete icon." into sc-dev am: 4122f670 am: e52d575f am: 886cdae2

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

Change-Id: I428e82af45a9ff49909a46cc676c75d1a89e3f25