Merge "Add STATUS_BAR_SERVICE permission to phone uid"