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

Change-Id: I585410a381836770d4b98359f8ae9ff3723b6c10