[automerger skipped] Merge "scrub pii (imsi) from carrierIdentifier logging" am: 7871659f67
am: 44b5e3389f -s ours
am skip reason: change_id I642d60e4ba1001bfd481aada87fa08dbd19098be with SHA1 61b2c86719 is in history

Change-Id: I2299794a693c8a2d580644b34331ec3067e2fad2