Merge "Remove usage of ITelecomService.getCallState() hidden API"