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: a67c59fa am: 631cf8a9

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



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