Merge "Add extra key for app-specified outgoing call timeout" am: decc6c9d56
am: 2bc24e252e

Change-Id: I1912bfa8856e78f375587d94bf589ef2fd25bee8