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

Change-Id: I12830995d5a6f14d5aabd30cc084e36b4d4b740c