[automerger skipped] Merge "Telephony module will staticlly link IState.java" am: 46e185031a am: 1215c5e690 am: b6543a4d90 -s ours
am skip reason: Change-Id I5a9ddbebadcf6226402f6e4a37ced168fe07d55b with SHA-1 64fffb9787 is in history

Change-Id: I1e34c33f46b527728b8531ce981445299824ffac