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

Change-Id: Ie4987e836593709c52a7afbedf826501180e1299