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

Change-Id: I3f1d667503cb406d04ad5910deb1177583243a36