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

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

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