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

Change-Id: I51eec04fe08c91c8d4043805f47bf6a91ba91256