Bug: 34520588 Test: View_FocusHandlingTest Change-Id: I7a20a6e9c57fc61bd2562307f4e7f8dee1979a40 (cherry picked from commit 9a0ea386)