[automerger skipped] Merge "Add Carrier Display Name Resolver" am: 01b06c77
am: 13c83eaa -s ours
am skip reason: change_id If46dc6c9c3172ff9e532a8b0e55dd941bca6857d with SHA1 f131d5e5 is in history
Change-Id: I56cdd4d86d907e5ec2a3d9dd37aa9166bc3ce39f