Merge "Add enum entries for new call states" am: d575295522 am: 06122c32ed
am: 55f89f61d3

Change-Id: If4c4ce31f9b2b6834a90274d857beb76acdec0f9