Merge "SlicePurchaseActivity don't send canceled on manual finish" into udc-dev am: 5f3efd4039 am: ab96b07cfa am: a67c59faf1 am: 631cf8a9c2
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>
This commit is contained in: