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

Change-Id: If5c12292793afc5b76fb74a869353d92ce8dcb85