[automerger skipped] Merge "Remove hidden APIs for callState and dataState." am: 69cad8ffbb am: 50c19a7d3d
am: 181f60ccf4 -s ours
am skip reason: change_id I008f47447f15ac556c8a88297a8706543e25b3e8 with SHA1 762281bd66 is in history

Change-Id: I86612cac29a4ffa852cbcdf56203236abd668d5b