Merge "Fixes app crash when starts activity with...

Merge "Fixes app crash when starts activity with FLAG_ACTIVITY_REORDER_TO_FRONT" into tm-qpr-dev am: d0767e2b

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



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