[automerger skipped] Merge "Pass in multiple device/carrier configurations...
[automerger skipped] Merge "Pass in multiple device/carrier configurations into ImsResolver" am: bab3837e am: 00c05fe1 am: a88a5a47 -s ours
am skip reason: Change-Id I96bf2d6183d86b4b969e9070776d498b1a625740 with SHA-1 42de290f is in history
Change-Id: I63d7c04fcaddfc7d60f779578cafbc57f573d950