Change-Id: Ieb29f6ba9dadacb2c7e26969a47141e11a339a40 Conflicts: telecomm/java/android/telecomm/InCallCall.java