Merge "Iterate through Phones when routing Emergency Call am: 0159eeb32c am: dc5c9d8c04" into nyc-mr1-dev-plus-aosp