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

Change-Id: I403da9dbf4c9cd9f1e9a69f7152bba4832b734e7