Merge "Mask IccId which gets printed in bug reports & radio logs." into mnc-dr-dev