Merge "Update TaskFragmentToken for Activity relaunch" into tm-qpr-dev am: 379c38b1

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



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