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

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



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