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

Change-Id: I95fd852526c18ad0cb9f4c1e84c9b553858f7129