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

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

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