[automerger skipped] Merge "Merge "scrub pii (imsi) from carrierIdentifier...

[automerger skipped] Merge "Merge "scrub pii (imsi) from carrierIdentifier logging" am: 7871659f am: 44b5e338" into pi-dev-plus-aosp
am: 6c6dcce5 -s ours
am skip reason: change_id I642d60e4ba1001bfd481aada87fa08dbd19098be with SHA1 c33a47fe is in history

Change-Id: Ib9381e8ebecbdee6a91e9ad268e26d85d7cfa5e0