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

Change-Id: I3121dcaf973a10043ffcaa0c8251aa21e18d027e