Merge "Shift focus when a task with multiple activities gets removed" into...

Merge "Shift focus when a task with multiple activities gets removed" into tm-qpr-dev am: d012ff2d am: 4d5cfe52

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



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