Merge "Deprecate acceptRingingCall and endCall." am: 6e3a88a3e2
am: 280019629c

Change-Id: Ie2bc60b8c8f5abc1651944fa3f927b23ab545d0f