Merge "selinux move aocx from vndservice to service" into main