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