Merge "SlicePurchaseActivity don't send canceled on manual finish" into...

Merge "SlicePurchaseActivity don't send canceled on manual finish" into udc-dev am: 5f3efd40 am: ab96b07c am: 819987a6 am: 7749bda3

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



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