Back-port ag/2514922

Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.

Change-Id: I9a58fd647e53cb41f577d8d4782221d73b49f668
2 files changed