Merge "Replacing accessibility service permissions with capability attributes." into jb-mr2-dev