Merge "Allow apps with carrier privileges to access device IDs"