Merge "selinux changes to add time detector service"