[automerger skipped] Merge "Fix NPE when starting activity while no focused...

[automerger skipped] Merge "Fix NPE when starting activity while no focused task" into rvc-qpr-dev am: 6c6907db am: f04f7e06 -s ours

am skip reason: Change-Id Ica58b7e8c93e7aa688b335d1ecf7464bc8450e30 with SHA-1 d02eb8c7 is in history

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

Change-Id: Ic2106ec2dcfcd14b69688f4c19ec88c4b41496ba