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

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



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