Merge "Add extra key for app-specified outgoing call timeout" into nyc-mr2-dev
am: 4d3435637f  -s ours

Change-Id: I2ed7250a9fb8c5026b209ad5b3384a401b1d4d16