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

Change-Id: I1fcb2898c1081797e2f6068e5ec9d1ea34452dfc