Merge "Do not show roaming icon for Personal operator of Argentina" into nyc-mr1-dev am: eeb90153c1 am: 8f69452fc9
am: 0342e056bd

Change-Id: I06c5b89aaa77f85c3472098ce25774ac9e96dab7