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

Change-Id: I74e17c3983cb249e84ca0654c6a643e4657663ff