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

Change-Id: I57b15236a05c532582b5f46b544c07924247780c