Merge "Do not append NEW_TASK flag when caller activity is finishing" into...

Merge "Do not append NEW_TASK flag when caller activity is finishing" into tm-qpr-dev am: 715ec8b3 am: d9bdb999

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



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