Merge "Add SDK compatibility code for new call states" am: 22027a86e2 am: d071c48af9 am: 6355d3947f
am: afefb720bb

Change-Id: If2abe4e044f7a6a084cde40a1fa89be9e634ec2a