Merge "Better guarantee a11y service initial state" into oc-mr1-dev am: c354e02234
am: f7836b985a  -s ours

Change-Id: I126df4af44eaedf2c2e2b5dc1e5d218cc132bfb2