Merge "Don't enable a11y service if scary dialog obscured" into oc-dev am: 0b9cd1b40e
am: ba98033945

Change-Id: I81533c721182e0e118bc2ed6eea7800c62b5be69