Merge "Fixes NPE crash when startActivityFromRecents" into tm-qpr-dev am: a890b22d3a am: 9db8164905

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

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