Merge "Fix blocking task switch when 3P launcher is used." into tm-qpr-dev am:...

Merge "Fix blocking task switch when 3P launcher is used." into tm-qpr-dev am: b7b84320 am: 9a4eb43b

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



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