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

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

Change-Id: Ia170a72614648614cb33c8ff079531f1507899d0