Merge "Accept timeout from apps requesting call disconnect" am: b2d915147c
am: f8a3007b8d

Change-Id: I60b6b6520c4ad0abee9ff8b328e34ccb9bd51c7d