Merge "Remove usage of ITelecomService.getCallState() hidden API" am: b93721efc7 am: 3959d1affc
am: 724e258f1a

Change-Id: I980f29241e67d8f08002d1e96e7c61ee5c9e69a4