Merge "Add new call states and refactor CAMSM parameters"
am: fd53bf3d80

Change-Id: I5b6808191cfb7fe7836284331dcbde01b5d2f108