[automerger skipped] Merge "DO NOT MERGE Reset top focused root task when task...

[automerger skipped] Merge "DO NOT MERGE Reset top focused root task when task hidden" into rvc-qpr-dev am: f61739c7 am: 77b07ba3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2e525f4c15d9b2207cc3b04e97305a7357c9c0c7