Merge "Fix crash when using list of enabled a11y services" into oc-dev
am: 3879a39ee6

Change-Id: Ifa3acdc07c4b9420fbb421587432b0c0aae203a2