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

Change-Id: I27bd9230c19b98a041a40c23016fd45f09d20921