Merge "Add BIND_IMS_SERVICE permission to the shell"