Merge "Alphabetize a11y aconfig flags to help limit merge conflicts." into main