[automerger skipped] Merge "[DO NOT MERGE] Fix focusable a11y overlay obstructing introspection" into pi-dev am: 8ec69c71a7
am: 2b8ba80576  -s ours

Change-Id: I2dc993e57c0a3dc9a0f8c1c2df28ee6b4b310fd4