Merge "Dismiss DSU notification in executeDiscardCommand()" am: 3313038017 am: 7af64dd1f7 am: 9e47644314

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

Change-Id: I594969a53e55a148ce6277dae47e9b1e4f888b6b