Merge "Remove hidden APIs for callState and dataState."
am: 69cad8ffbb

Change-Id: I9c54db83720877a95a88865633a7d7dfc9300d15