DO NOT MERGE Remove CallState and rename PRE_DIAL_WAIT

Bug: 20532827
Bug: 20532435
Change-Id: I5f0308c5cf4e4a9cf9020b4fe7fa5f3f8dee6e67
4 files changed