Merge "SlicePurchaseActivity don't send canceled on manual finish" into udc-dev am: 5f3efd40

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



Change-Id: Ibc45a52ae582c3f523a7b607a67618a47acc040a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>