Merge "Telephony module will staticlly link IState.java"
am: 46e185031a

Change-Id: I474f123c7960299aa8ea317290648bb3077c5385