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

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



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