Merge "Fix finishTranslation doesn't work if start Activity in the same task"...

Merge "Fix finishTranslation doesn't work if start Activity in the same task" into tm-dev am: 313d6bfe

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



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