Merge "Pass in the correct binder token when calling AMS.finishReceiver()." into udc-dev am: 0ffb527e5f

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

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