Merge "Add getNetworkSpecifier() and getCarrierConfig()" am: 68d03b23bb am: ea0e111468 am: 89a85b0683
am: 9e3a4957fc  -s ours

Change-Id: I3c47ef16a7c937fe2bebf49a7185249a26e64650