Merge "SlicePurchaseActivity don't send canceled on manual finish" into udc-dev am: 5f3efd4039 am: ab96b07cfa am: 819987a6d6

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

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