Merge "Add selinux changes for  Locale Manager Service"