Reland "Refine FocusHandlingTest"

This reverts commit 89c1adff9f3e9a7f419737fca1404487c87703ba.

Since CL[1] fixed the original issue, re-land the CTS refinement to
align with the framework change and test expectation.

[1]: I45a9814d812ad906f417c24200fd4219959e2423

Bug: 152373385
Bug: 155781821
Test: atest FocusHandlingTest
Change-Id: Ie029c109e257be81a1ad6327a706bb6bc1e8316c
2 files changed