Merge "Avoid adjusting top focused root task while clear task" into...

Merge "Avoid adjusting top focused root task while clear task" into rvc-qpr-dev am: 84cc3c88 am: b0f7a7ab

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

Change-Id: I21bb7a6534507f2350f8e5d93bcb4d27daebb9dd