Merge "Relax the result-to restriction if activity is finishing" into...

Merge "Relax the result-to restriction if activity is finishing" into tm-qpr-dev am: 87dbce7b am: 219dce99

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



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