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

Change-Id: I7e2924cc63ad00ac7b33e9cf3796704fe64d2989