Merge "Improve handling of crashing a11y services." into nyc-mr1-dev
am: f861b916e4

Change-Id: I014ddc40f121e602635cc0436926810ca918da13