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

Change-Id: I194764e131c4ea26fd48cef2abe87f876e4295f5