[automerger skipped] Merge "Telephony modules will statically link...
[automerger skipped] Merge "Telephony modules will statically link IState.java" am: ec2802e3 am: 52d07990 am: c1016efc -s ours
am skip reason: Change-Id I87676375dc6bd055448021dcce30d6f98f99ba81 with SHA-1 dbc66d5d is in history
Change-Id: Ieb6b6410f97afea3cdde65fc58e3731f3f4f74ce